Remove conflict markers.

diff --git a/man/ChangeLog b/man/ChangeLog
index 341be9a3e424319be240475d33ff839be1426699..43edb631b9c95173add4895b267a84d20dac5168 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -2,12 +2,10 @@
 
        * org.texi: Version 3.14
 
-<<<<<<< ChangeLog
 2005-07-04  Carsten Dominik  <dominik@science.uva.nl>
 
        * org.texi: Version 3.13
 
-=======
 2005-07-19  Juri Linkov  <juri@jurta.org>
 
        * files.texi (Comparing Files): Mention resync for `compare-windows'.